From aa85282bb637b129b347774a250654f525f3f76f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 3 Sep 2014 17:01:43 +0200 Subject: [PATCH] Adwaita: change `font-size: 82%` to `font-size: smaller` --- gtk/resources/theme/Adwaita/_common.scss | 8 +++----- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 +++--- gtk/resources/theme/Adwaita/gtk-contained.css | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 7295441ea6..ee6630f3d9 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -964,7 +964,7 @@ GtkComboBox { padding: 0px 12px; } .subtitle { - font-size: 82%; + font-size: smaller; padding: 0 12px; @extend .dim-label; } @@ -1635,7 +1635,7 @@ GtkSwitch { -GtkSwitch-slider-width: 45px; // 55px is the right value to make it as tall // as buttons, not doing that for now font-weight: bold; - font-size: 82%; + font-size: smaller; outline-offset: -4px; box-shadow: inset 0 1px transparentize(black, 0.9), // needs to be set here _widget_edge(); // otherwise it gets @@ -2003,11 +2003,9 @@ $asset_suffix: if($variant=='dark', '-dark', ''); * Progress bars * *****************/ -//FIXME it's a wip ok? - GtkProgressBar { padding: 0; - font-size: 82%; + font-size: smaller; color: transparentize($fg_color, 0.6); box-shadow: inset 1px 1px transparentize(black, 0.9), // needs to be set _widget_edge(); // here ot it gets diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 36015d0106..aae82b40fa 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1192,7 +1192,7 @@ GtkComboBox { padding: 0px 12px; } .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { - font-size: 82%; + font-size: smaller; padding: 0 12px; } .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical, .sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop, @@ -1903,7 +1903,7 @@ GtkTreeView.view.progressbar { GtkSwitch { -GtkSwitch-slider-width: 45px; font-weight: bold; - font-size: 82%; + font-size: smaller; outline-offset: -4px; box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); } GtkSwitch.trough { @@ -2795,7 +2795,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { *****************/ GtkProgressBar { padding: 0; - font-size: 82%; + font-size: smaller; color: rgba(238, 238, 236, 0.4); box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); } GtkProgressBar:backdrop { diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 8a468ccf37..b78b48c7cc 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1184,7 +1184,7 @@ GtkComboBox { padding: 0px 12px; } .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { - font-size: 82%; + font-size: smaller; padding: 0 12px; } .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical, .sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop, @@ -1897,7 +1897,7 @@ GtkTreeView.view.progressbar { GtkSwitch { -GtkSwitch-slider-width: 45px; font-weight: bold; - font-size: 82%; + font-size: smaller; outline-offset: -4px; box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px white; } GtkSwitch.trough { @@ -2934,7 +2934,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { *****************/ GtkProgressBar { padding: 0; - font-size: 82%; + font-size: smaller; color: rgba(46, 52, 54, 0.4); box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; } GtkProgressBar:backdrop { -- 2.30.2